libxenguest: Fix libbz2/liblzma dependency computation.
authorKeir Fraser <keir.fraser@citrix.com>
Thu, 20 Aug 2009 21:26:16 +0000 (22:26 +0100)
committerKeir Fraser <keir.fraser@citrix.com>
Thu, 20 Aug 2009 21:26:16 +0000 (22:26 +0100)
 1. Create an empty dep file if neither lib is installed
 2. Forcibly disable support for libs if building minios

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
tools/libxc/Makefile

index 2adf8e689d854095aae64303ca8afac2c8cd21fe..5693025e60ecd6ab866f206948b78dd7b7799d26 100644 (file)
@@ -151,10 +151,14 @@ libxenguest.so: libxenguest.so.$(MAJOR)
 libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
        ln -sf $< $@
 
+ifeq ($(CONFIG_MiniOS),y)
+.zlib.deps:
+       echo >$@
+else
 .zlib.deps:
        @(set -e;                                       \
           . ../check/funcs.sh;                         \
-         rm -f $@.new;                                 \
+         echo >$@.new;                                 \
          if has_header bzlib.h; then                   \
             echo "-DHAVE_BZLIB" >>$@.new;              \
            echo "-lbz2" >>$@.new;                      \
@@ -166,6 +170,7 @@ libxenguest.so.$(MAJOR): libxenguest.so.$(MAJOR).$(MINOR)
            echo " - LZMA decompression supported";     \
          fi;                                           \
          mv $@.new $@)
+endif
 
 xc_dom_bzimageloader.o: .zlib.deps
 xc_dom_bzimageloader.o: CFLAGS += $(shell grep D .zlib.deps)